Correct GdkX11 import path in docs and include guards

Update the include directives in the documentation, as well as the
include guards in headers, to point to gdk/x11/gdkx.h.

closes #2254

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 7cb4a8aab9d1ee840998327f1928fe3fbc736330..d169a3f981937f054d19c9f2a76cd63ce286b64d 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -789,8 +789,6 @@ gdk_drop_get_type
 </SECTION>
 
 <SECTION>
-<INCLUDE>gdk/gdkx.h</INCLUDE>
-<TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_SURFACE_XID
 GDK_DISPLAY_XDISPLAY

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 0ce77b3048f16daf7f973048383eea128ee01352..82dd70011dd0f2f76bf15ebf4cabf2a4162f5618 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -50,9 +50,10 @@
  * SECTION:x_interaction
  * @Short_description: X backend-specific functions
  * @Title: X Window System Interaction
+ * @Include: gdk/x11/gdkx.h
  *
  * The functions in this section are specific to the GDK X11 backend.
- * To use them, you need to include the `<gdk/gdkx.h>` header and use
+ * To use them, you need to include the `<gdk/x11/gdkx.h>` header and use
  * the X11-specific pkg-config file `gtk4-x11` to build your application.
  *
  * To make your code compile with other GDK backends, guard backend-specific

diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
index e615a14efd74e171599dadccc6e04494d011ef54..e2353f85eef3ea82f91462c451421c1abfb337f0 100644 (file)
--- a/gdk/x11/gdkx-autocleanups.h
+++ b/gdk/x11/gdkx-autocleanups.h
@@ -16,7 +16,7 @@
  */
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #ifndef __GI_SCANNER__

diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h
index e7d02edc074171d2d148eabac97bc537a4a94520..93a2f8c1da9252ec0fd3ba55952bc89f5ed7fffc 100644 (file)
--- a/gdk/x11/gdkx11applaunchcontext.h
+++ b/gdk/x11/gdkx11applaunchcontext.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_APP_LAUNCH_CONTEXT_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h
index 56cb9edb3044c669fca5835ba63831388ecc3196..cab49734dfeda653921f0253aa08cc854d297f4d 100644 (file)
--- a/gdk/x11/gdkx11device.h
+++ b/gdk/x11/gdkx11device.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_DEVICE_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h
index e99806c6b21c7c6cae558289bb39c4da0f8679a2..f3b081546203d64b196db6930f48c19812f196e9 100644 (file)
--- a/gdk/x11/gdkx11devicemanager.h
+++ b/gdk/x11/gdkx11devicemanager.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_DEVICE_MANAGER_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 570d08b0faeeb0bd7c39a0e59294c044992bfbef..b885357f7007bc9fbf130ab623d9001adc7fecc5 100644 (file)
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_DISPLAY_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h
index dfe60500c64ed48b87c388e93f351187642c0dda..531898337546017420a5a178337176b3729788bc 100644 (file)
--- a/gdk/x11/gdkx11dnd.h
+++ b/gdk/x11/gdkx11dnd.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_DND_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h
index 0701869133c01ff53a199b52db5d2ccc6163a032..29235dcb02e36561db7f9887e30d9b30ae149beb 100644 (file)
--- a/gdk/x11/gdkx11glcontext.h
+++ b/gdk/x11/gdkx11glcontext.h
@@ -22,7 +22,7 @@
 #define __GDK_X11_GL_CONTEXT_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h
index a011bb483de1da4fcbb1b65df719b6fb68f420f0..e4575d59275cc0147c0d4844caed98358d49d4f6 100644 (file)
--- a/gdk/x11/gdkx11keys.h
+++ b/gdk/x11/gdkx11keys.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_KEYS_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11monitor.h b/gdk/x11/gdkx11monitor.h
index d1363437e6e5e4f05b2074d8c221a64a1b757b6d..8f7dd86177682b1f1c5293ff1b018a94221104e8 100644 (file)
--- a/gdk/x11/gdkx11monitor.h
+++ b/gdk/x11/gdkx11monitor.h
@@ -23,7 +23,7 @@
 #define __GDK_X11_MONITOR_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>

diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 9b3e6943199f2164b6ef3f189c4378c1ecc41720..8fac2b11bed5672ff1489ebc0a96dc6ac93b3d74 100644 (file)
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_PROPERTY_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index 791bb4b6b4afcdb2fe9a5ee26f1e6c2c9fd69c05..bb82c869797325e8bfd4de10b263edf843fdaa58 100644 (file)
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_SCREEN_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 9123d473a21a1a6fdaa56e610a14d70579c7668f..1a91f115959e544a119806580452415238d60f0e 100644 (file)
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_SELECTION_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h
index 844a2de9cd4285eb05d8f4f0fb3eafab512ed79f..fdd7d8eb95203ebb3045a04b2120814cd38f9469 100644 (file)
--- a/gdk/x11/gdkx11surface.h
+++ b/gdk/x11/gdkx11surface.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_SURFACE_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
index e5604d13c9f29b10ca309f544749c1d57e898b1c..7ed8ca833ef4167c2f1718139198fde7a2c93d27 100644 (file)
--- a/gdk/x11/gdkx11utils.h
+++ b/gdk/x11/gdkx11utils.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_UTILS_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>